From: Ray Strode <rstrode@redhat.com>
Date: Tue, 7 Jan 2014 18:14:31 +0000 (-0500)
Subject: main: allow session mode to be specified in the environment
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2944
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=43cffd7c4a0e0d38e2f2c75c58c866b31f6f9b0d;p=gnome-shell.git

main: allow session mode to be specified in the environment

Specifying the session mode on the command-line doesn't play
well with session management (since the saved session desktop
file well either drop the specified session mode, or force it
always, even if the user picked a different mode at the login
screen)

This commit adds support for specifying the session mode via an
enviroment variable. For now, keep the old command line interface
for backward compatibility

https://bugzilla.gnome.org/show_bug.cgi?id=720894
---

diff --git a/src/main.c b/src/main.c
index 79161b63e..99494a04d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -380,6 +380,8 @@ main (int argc, char **argv)
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
+  session_mode = (char *) g_getenv ("GNOME_SHELL_SESSION_MODE");
+
   ctx = meta_get_option_context ();
   g_option_context_add_main_entries (ctx, gnome_shell_options, GETTEXT_PACKAGE);
   g_option_context_add_group (ctx, g_irepository_get_option_group ());